Set file GtkPrinter accepts_pdf/ps based on selected format

diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index e19193ffdd717bceeb03a972d140a1c27ec6d3ca..b23220a0af6b513d7ef91e300e648ab8931f325c 100644 (file)
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -172,6 +172,10 @@ GtkPrinter *gtk_printer_new                   (const char      *name,
                                               GtkPrintBackend *backend,
                                               gboolean         is_virtual);
 gboolean    gtk_printer_is_new                (GtkPrinter      *printer);
+void        gtk_printer_set_accepts_pdf       (GtkPrinter      *printer,
+                                              gboolean         val);
+void        gtk_printer_set_accepts_ps        (GtkPrinter      *printer,
+                                              gboolean         val);
 void        gtk_printer_set_is_new            (GtkPrinter      *printer,
                                               gboolean         val);
 void        gtk_printer_set_is_active         (GtkPrinter      *printer,

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index fdb6c801cb6fc7a9953c5f7cdf8e2663ba07e3ff..4d5112b038da81c1b2a401cbdabf473ea244641a 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -795,6 +795,15 @@ gtk_printer_accepts_pdf (GtkPrinter *printer)
   return printer->priv->accepts_pdf;
 }
 
+void
+gtk_printer_set_accepts_pdf (GtkPrinter *printer,
+                            gboolean val)
+{
+  g_return_if_fail (GTK_IS_PRINTER (printer));
+
+  printer->priv->accepts_pdf = val;
+}
+
 /**
  * gtk_printer_accepts_ps:
  * @printer: a #GtkPrinter
@@ -814,6 +823,15 @@ gtk_printer_accepts_ps (GtkPrinter *printer)
   return printer->priv->accepts_ps;
 }
 
+void
+gtk_printer_set_accepts_ps (GtkPrinter *printer,
+                           gboolean val)
+{
+  g_return_if_fail (GTK_IS_PRINTER (printer));
+
+  printer->priv->accepts_ps = val;
+}
+
 gboolean
 gtk_printer_is_new (GtkPrinter *printer)
 {

diff --git a/modules/printbackends/file/gtkprintbackendfile.c b/modules/printbackends/file/gtkprintbackendfile.c
index 7f0bd3532e1b146c64a1b60660359ff14c8e69b3..3322db1a465b8a6e6b9e4ccef897fec46dcadb7e 100644 (file)
--- a/modules/printbackends/file/gtkprintbackendfile.c
+++ b/modules/printbackends/file/gtkprintbackendfile.c
@@ -514,17 +514,63 @@ gtk_print_backend_file_init (GtkPrintBackendFile *backend)
   gtk_print_backend_set_list_done (GTK_PRINT_BACKEND (backend));
 }
 
+typedef struct {
+  GtkPrinter          *printer;
+  GtkPrinterOptionSet *set;
+} _OutputFormatChangedData;
+
+static void
+set_printer_format_from_option_set (GtkPrinter          *printer,
+                                   GtkPrinterOptionSet *set)
+{
+  GtkPrinterOption *format_option;
+  const gchar *value;
+  gint i;
+
+  format_option = gtk_printer_option_set_lookup (set, "output-file-format");
+  if (format_option && format_option->value)
+    {
+      value = format_option->value;
+      if (value)
+        {
+         for (i = 0; i < N_FORMATS; ++i)
+           if (strcmp (value, formats[i]) == 0)
+             break;
+
+         g_assert (i < N_FORMATS);
+
+         switch (i)
+           {
+             case FORMAT_PDF:
+               gtk_printer_set_accepts_pdf (printer, TRUE);
+               gtk_printer_set_accepts_ps (printer, FALSE);
+               break;
+             case FORMAT_PS:
+               gtk_printer_set_accepts_pdf (printer, FALSE);
+               gtk_printer_set_accepts_ps (printer, TRUE);
+               break;
+             case FORMAT_SVG:
+             default:
+               gtk_printer_set_accepts_pdf (printer, FALSE);
+               gtk_printer_set_accepts_ps (printer, FALSE);
+               break;
+           }
+       }
+    }
+}
+
 static void
 file_printer_output_file_format_changed (GtkPrinterOption    *format_option,
-                                         GtkPrinterOptionSet *set)
+                                        gpointer             user_data)
 {
   GtkPrinterOption *uri_option;
   gchar            *base = NULL;
+  _OutputFormatChangedData *data = (_OutputFormatChangedData *) user_data;
 
   if (! format_option->value)
     return;
 
-  uri_option = gtk_printer_option_set_lookup (set,
+  uri_option = gtk_printer_option_set_lookup (data->set,
                                               "gtk-main-page-custom-input");
 
   if (uri_option && uri_option->value)
@@ -564,6 +610,8 @@ file_printer_output_file_format_changed (GtkPrinterOption    *format_option,
       g_free (tmp);
       g_free (base);
     }
+
+  set_printer_format_from_option_set (data->printer, data->set);
 }
 
 static GtkPrinterOptionSet *
@@ -583,6 +631,7 @@ file_printer_get_options (GtkPrinter           *printer,
   OutputFormat format;
   gchar *uri;
   gint current_format = 0;
+  _OutputFormatChangedData *format_changed_data;
 
   format = format_from_settings (settings);
 
@@ -667,9 +716,13 @@ file_printer_get_options (GtkPrinter           *printer,
       gtk_printer_option_set (option, supported_formats[current_format]);
       gtk_printer_option_set_add (set, option);
 
-      g_signal_connect (option, "changed",
-                        G_CALLBACK (file_printer_output_file_format_changed),
-                        set);
+      set_printer_format_from_option_set (printer, set);
+      format_changed_data = g_new (_OutputFormatChangedData, 1);
+      format_changed_data->printer = printer;
+      format_changed_data->set = set;
+      g_signal_connect_data (option, "changed",
+                            G_CALLBACK (file_printer_output_file_format_changed),
+                            format_changed_data, (GClosureNotify)g_free, 0);
 
       g_object_unref (option);
     }